Merged.

diff --cc tools/python/xen/xend/XendDomain.py
index e04361556e3bdfcfc1b4f8b5bc46eb19c40067f4,5971430ad9fd4ebb02da93cc339f48e4f533d060..592ab5fd605b1e52076300b53319a48890fe643f
--- 1/tools/python/xen/xend/XendDomain.py
--- 2/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@@ -395,10 -395,8 +395,11 @@@ class XendDomain
  
          dominfo = self.domain_lookup(domid)
  
-         port = xroot.get_xend_relocation_port()
 +        if dominfo.getDomid() == PRIV_DOMAIN:
 +            raise XendError("Cannot migrate privileged domain %i" % domid)
 +
+         if port == 0:
+             port = xroot.get_xend_relocation_port()
          try:
              sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
              sock.connect((dst, port))

diff --cc tools/python/xen/xm/migrate.py
index cc81ded89e52e908484128b9478cd9fe54d2a6d9,f36169ccf5fb599a58961a0a529a33f207d1c83f..691efad9a232b7166781eaec7eb36ab32e219129
--- 1/tools/python/xen/xm/migrate.py
--- 2/tools/python/xen/xm/migrate.py
+++ b/tools/python/xen/xm/migrate.py
@@@ -56,4 -62,7 +60,4 @@@ def main(argv)
          opts.err('Invalid arguments: ' + str(args))
      dom = args[0]
      dst = args[1]
-     server.xend_domain_migrate(dom, dst, opts.vals.live, opts.vals.resource)
 -    if dom in [DOM0_NAME, DOM0_ID]:
 -        opts.err('Cannot migrate ' + dom)
+     server.xend_domain_migrate(dom, dst, opts.vals.live, opts.vals.resource, opts.vals.port)
 -